redesign the toolbars

7 files changed, 34 insertions, 9 deletions

diff --git a/WebScraps.pro b/WebScraps.pro
index d9e52db..dfb75bd 100644
--- a/WebScraps.pro
+++ b/WebScraps.pro
@@ -16,3 +16,4 @@ HEADERS += mainwindow.h \
     graphicsview.h \
     graphicstoolbar.h
 FORMS += mainwindow.ui
+RESOURCES += webscraps.qrc
diff --git a/icons/cutscrap.png b/icons/cutscrap.png
new file mode 100644
index 0000000..9447baf
--- /dev/null
+++ b/icons/cutscrap.png
diff --git a/icons/internet.png b/icons/internet.png
new file mode 100644
index 0000000..071fc18
--- /dev/null
+++ b/icons/internet.png
diff --git a/icons/scraps.png b/icons/scraps.png
new file mode 100644
index 0000000..f549a73
--- /dev/null
+++ b/icons/scraps.png
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b58a2c7..ec1e685 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -17,7 +17,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     m_webView->setVisible(false);
     m_browserToolbar->setVisible(false);
-    connect(m_newScrapButton, SIGNAL(clicked()), SLOT(showBrowser()));
+    connect(m_gotoBrowserButton, SIGNAL(clicked()), SLOT(showBrowser()));
 }
 
 void MainWindow::initGraphicsView() {
@@ -82,15 +82,29 @@ void MainWindow::initBrowser() {
 
 void MainWindow::createScrapsToolbar(QGraphicsScene *scene) {
     m_scrapsToolbar = new GraphicsToolBar(scene);
-    m_scrapsToolbar->addWidget(m_searchBar = new QLineEdit);
-    m_scrapsToolbar->addWidget(m_searchScrapsButton = new QPushButton(tr("Search scraps")));
-    m_scrapsToolbar->addWidget(m_newScrapButton = new QPushButton(tr("New scrap")));
+    m_searchBar = new QLineEdit;
+    m_gotoBrowserButton = new QToolButton;
+    m_gotoBrowserButton->setIcon(QIcon(":/icons/internet.png"));
+    m_gotoBrowserButton->setText(tr("Go to browser"));
+    m_gotoBrowserButton->setToolTip(tr("Go to browser"));
+
+    m_scrapsToolbar->addWidget(m_searchBar);
+    m_scrapsToolbar->addWidget(m_gotoBrowserButton);
     m_scrapsToolbar->setPos(0, 0);
     m_scrapsToolbar->setZValue(1000);
 }
 
 void MainWindow::createBrowserToolbar(QGraphicsScene *scene) {
     m_browserToolbar = new GraphicsToolBar(scene);
+    m_addressBar = new QLineEdit;
+    m_selectScrapsButton = new QToolButton;
+    m_selectScrapsButton->setIcon(QIcon(":/icons/cutscrap.png"));
+    m_selectScrapsButton->setText(tr("Add a scrap"));
+    m_selectScrapsButton->setToolTip(tr("Create a scrap from current page"));
+    m_gotoScrapsButton = new QToolButton;
+    m_gotoScrapsButton->setIcon(QIcon(":/icons/scraps.png"));
+    m_gotoScrapsButton->setText(tr("View scraps"));
+    m_gotoScrapsButton->setToolTip(tr("View existing scraps"));
     QToolButton *backBtn = new QToolButton;
     QToolButton *forwardBtn = new QToolButton;
     QToolButton *reloadBtn = new QToolButton;
@@ -103,12 +117,15 @@ void MainWindow::createBrowserToolbar(QGraphicsScene *scene) {
     m_browserToolbar->addWidget(forwardBtn);
     m_browserToolbar->addWidget(reloadBtn);
     m_browserToolbar->addWidget(stopBtn);
-    m_browserToolbar->addWidget(m_addressBar = new QLineEdit);
-    m_browserToolbar->addWidget(m_selectScrapsButton = new QPushButton(tr("Select scraps")));
+    m_browserToolbar->addWidget(m_selectScrapsButton);
+    m_browserToolbar->addWidget(m_addressBar);
+    m_browserToolbar->addWidget(m_gotoScrapsButton);
     m_addressBar->setMinimumWidth(200);
     connect(m_addressBar, SIGNAL(returnPressed()), SLOT(changeLocation()));
+
     m_browserToolbar->setPos(200, 0);
     m_browserToolbar->setZValue(1000);
+
 }
 
 MainWindow::~MainWindow()
diff --git a/mainwindow.h b/mainwindow.h
index 7ddfb04..91e6998 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -5,7 +5,7 @@
 #include <QWebView>
 #include <QLineEdit>
 #include <QProgressBar>
-#include <QPushButton>
+#include <QToolButton>
 #include <QList>
 #include "webview.h"
 #include "graphicsview.h"
@@ -44,14 +44,14 @@ private:
 
     // scraps view
     QLineEdit *m_searchBar;
-    QPushButton *m_searchScrapsButton, *m_newScrapButton;
+    QToolButton *m_searchScrapsButton, *m_gotoBrowserButton;
     GraphicsToolBar *m_scrapsToolbar;
     QList<WebScrap*> m_scraps;
 
     // browser view
     WebView *m_webView;
     QLineEdit *m_addressBar;
-    QPushButton *m_selectScrapsButton, *m_addScrapButton;
+    QToolButton *m_selectScrapsButton, *m_addScrapButton, *m_gotoScrapsButton;
     GraphicsToolBar *m_browserToolbar;
 };
 
diff --git a/webscraps.qrc b/webscraps.qrc
new file mode 100644
index 0000000..e908dbb
--- /dev/null
+++ b/webscraps.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/">
+        <file>icons/cutscrap.png</file>
+        <file>icons/internet.png</file>
+        <file>icons/scraps.png</file>
+    </qresource>
+</RCC>